bitkeeper revision 1.1297 (425ed8e8fyYSNRfTQEAOwYEwqTp89A)
authormaf46@burn.cl.cam.ac.uk <maf46@burn.cl.cam.ac.uk>
Thu, 14 Apr 2005 20:56:08 +0000 (20:56 +0000)
committermaf46@burn.cl.cam.ac.uk <maf46@burn.cl.cam.ac.uk>
Thu, 14 Apr 2005 20:56:08 +0000 (20:56 +0000)
Merge burn.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into burn.cl.cam.ac.uk:/local/scratch-1/maf46/xen-unstable.bk

Signed-off-by: michael.fetterman@cl.cam.ac.uk

Trivial merge